Disable build of pygrub for now - does not build with e2fsprogs-1.35

Signed-off-by: Steven Hand <steven@xensource.com>

diff --git a/.hgignore b/.hgignore
index 2024edc1f06eb937411783a3149695cc3da4807a..247869cdba875d5a78fa0fe5816bf8a9606a68e1 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -128,8 +128,8 @@
 ^tools/misc/xc_shadow$
 ^tools/misc/xen_cpuperf$
 ^tools/misc/xenperf$
-^tools/policy/policy_tool$
-^tools/policy/xen/.*$
+^tools/security/secpol_tool$
+^tools/security/xen/.*$
 ^tools/pygrub/build/.*$
 ^tools/python/build/.*$
 ^tools/tests/test_x86_emulator$

diff --git a/tools/Makefile b/tools/Makefile
index 5418adf4154ccb7907e176f7531f4f829290b2ca..917356fedb9dc1ea6a5f4c3c168d4f755bad8630 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,7 +10,7 @@ SUBDIRS += xentrace
 SUBDIRS += python
 SUBDIRS += xcs
 SUBDIRS += xcutils
-SUBDIRS += pygrub
+#SUBDIRS += pygrub
 SUBDIRS += firmware
 SUBDIRS += security
 

diff --git a/tools/pygrub/src/fsys/ext2/ext2module.c b/tools/pygrub/src/fsys/ext2/ext2module.c
index 13ce92108d64cb21d740859941331e383cf9ee75..f5f95a7aa7067854610998267a7cc1b97cdae177 100644 (file)
--- a/tools/pygrub/src/fsys/ext2/ext2module.c
+++ b/tools/pygrub/src/fsys/ext2/ext2module.c
@@ -229,8 +229,8 @@ ext2_fs_open (Ext2Fs *fs, PyObject *args, PyObject *kwargs)
         snprintf(offsetopt, 29, "offset=%d", offset);
     }
 
-    err = ext2fs_file_open2(name, offsetopt, flags, superblock, block_size, 
-                            unix_io_manager, &efs);
+    err = ext2fs_open2(name, offsetopt, flags, superblock, block_size, 
+                       unix_io_manager, &efs);
     if (err) {
         PyErr_SetString(PyExc_ValueError, "unable to open file");
         return NULL;